Auto merge of #1932 - steveklabnik:gh1767, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 16:20:19 +0000 (16:20 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 16:20:19 +0000 (16:20 +0000)
commitc7e7e35112c43f8a5f13f03eb830a008b940eab9
tree71cbb684b07438838a42b6a90750d87db34356cf
parent06b6704ea97c82eb966ba57a94a31abd1415f78f
parent355e7fb81a53fbc58885f501b68e8b6239964a33
Auto merge of #1932 - steveklabnik:gh1767, r=alexcrichton

Fixes #1767